Don't implement GApplication mainloop
authorRyan Lortie <desrt@desrt.ca>
Wed, 14 Sep 2011 02:47:30 +0000 (22:47 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 9 Nov 2011 05:22:52 +0000 (00:22 -0500)
Let the default GApplication implementation take care of it.

https://bugzilla.gnome.org/show_bug.cgi?id=658805

gtk/gtkapplication.c

index c192d75e0b1c04f6917cfe99effdffd7e05fc9ce..f0bba4312f090f61ceac947b2484d3f1b05e3f8d 100644 (file)
@@ -30,7 +30,6 @@
 #include "gtkapplication.h"
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"
-#include "gtkmain.h"
 
 #include <gdk/gdk.h>
 #ifdef GDK_WINDOWING_X11
@@ -103,18 +102,6 @@ gtk_application_startup (GApplication *application)
   gtk_init (0, 0);
 }
 
-static void
-gtk_application_quit_mainloop (GApplication *application)
-{
-  gtk_main_quit ();
-}
-
-static void
-gtk_application_run_mainloop (GApplication *application)
-{
-  gtk_main ();
-}
-
 static void
 gtk_application_add_platform_data (GApplication    *application,
                                    GVariantBuilder *builder)
@@ -208,9 +195,6 @@ gtk_application_class_init (GtkApplicationClass *class)
   application_class->after_emit = gtk_application_after_emit;
   application_class->startup = gtk_application_startup;
 
-  application_class->quit_mainloop = gtk_application_quit_mainloop;
-  application_class->run_mainloop = gtk_application_run_mainloop;
-
   class->window_added = gtk_application_window_added;
   class->window_removed = gtk_application_window_removed;